wayland/popup: Emit un-withdrawn event earlier

Otherwise grabbing the seat will appear to have failed.

diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index e4fdae31225cebfb5a0a82563ec489e70952141b..d0fb6d8420e62adfb9a328846e6d51088f186b94 100644 (file)
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -2719,6 +2719,8 @@ gdk_wayland_surface_map_popup (GdkSurface     *surface,
   impl->popup.unconstrained_width = width;
   impl->popup.unconstrained_height = height;
   impl->mapped = TRUE;
+
+  gdk_synthesize_surface_state (surface, GDK_SURFACE_STATE_WITHDRAWN, 0);
 }
 
 static void
@@ -2826,7 +2828,6 @@ gdk_wayland_surface_present_popup (GdkSurface     *surface,
 
   if (impl->display_server.xdg_popup)
     {
-      gdk_synthesize_surface_state (surface, GDK_SURFACE_STATE_WITHDRAWN, 0);
       gdk_surface_invalidate_rect (surface, NULL);
       return TRUE;
     }